From 47a4c50a85693fb1196eb623facd675ac9ed710f Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Thu, 6 Apr 2006 06:34:20 +0000
Subject: [PATCH] More (undertested) expat test sense changes.

---
 gpsbabel/coastexp.c        | 9 +++++----
 gpsbabel/jeeps/gpslibusb.c | 4 +---
 gpsbabel/xmlgeneric.c      | 4 ++++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gpsbabel/coastexp.c b/gpsbabel/coastexp.c
index a361e4381..a7909b896 100755
--- a/gpsbabel/coastexp.c
+++ b/gpsbabel/coastexp.c
@@ -19,10 +19,11 @@
 
 #include "defs.h"
 #if HAVE_LIBEXPAT
-#include "xmlgeneric.h"
-#include <expat.h>
-static XML_Parser psr;
+#  include "xmlgeneric.h"
+#  include <expat.h>
+   static XML_Parser psr;
 #endif
+
 #include <time.h>
 #include "cet_util.h"
 
@@ -37,7 +38,7 @@ static FILE *ofd;
 #define MY_TBUF 64
 #define MY_XBUF 128
 
-#if NO_EXPAT
+#if !HAVE_LIBEXPAT
 void
 ce_rd_init(const char *fname)
 {
diff --git a/gpsbabel/jeeps/gpslibusb.c b/gpsbabel/jeeps/gpslibusb.c
index f3d94e63b..0183ffc06 100644
--- a/gpsbabel/jeeps/gpslibusb.c
+++ b/gpsbabel/jeeps/gpslibusb.c
@@ -1,4 +1,3 @@
-#if HAVE_LIBUSB
 /*
     Physical/OS USB layer to talk to libusb.
 
@@ -24,6 +23,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <usb.h>
+#include "../config.h"
 #include "gps.h"
 #include "garminusb.h"
 
@@ -254,5 +254,3 @@ void garmin_usb_scan(void)
 		fatal("Found no Garmin USB devices.\n");
 	}
 }
-
-#endif /* HAVE_LIBUSB */
diff --git a/gpsbabel/xmlgeneric.c b/gpsbabel/xmlgeneric.c
index 3aae2d0ab..c5c3d3871 100644
--- a/gpsbabel/xmlgeneric.c
+++ b/gpsbabel/xmlgeneric.c
@@ -326,6 +326,10 @@ void xml_deinit(void)
 {
 }
 
+void xml_readstring(const char *)
+{
+}
+
 #endif /* HAVE_LIBEXPAT */
 
 /******************************************/
-- 
2.30.2